Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 18:52:37 +0000 (10:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 18:52:37 +0000 (10:52 -0800)
commit78e8026fbc48bcae1f3e5753a8966764ac1f8e97
tree79a4ac0487cc36860dd8791bed7581518eb242ab
parent5eab8f9fe430db61a71d28b62c9016367200cf68
parent93a8aacd371bb57f931bb2f45da2eb4b5839a799
Merge from mainline.